feat: merge feature/pro-sources into main#877
Draft
clay-lake wants to merge 14 commits intocanonical:mainfrom
Draft
feat: merge feature/pro-sources into main#877clay-lake wants to merge 14 commits intocanonical:mainfrom
clay-lake wants to merge 14 commits intocanonical:mainfrom
Conversation
* feat: add pro argument to lifecycle commands * feat: added testing to pro argument * feat: add ProServices class * refactor: migrated to pro python api * refactor(application.py): migrated validation instructions to run function * refactor: pro services validation * feat: testing support for pro service in existing tests * feat: parameterized testing of Peo services validation * refactor: fixed spelling * refactor: fixed pyright issues, needs future rework * refactor: address tox lint issues * refactor: applied suggestions from PR * fix(craft_application/commands/lifecycle.py): add argparse permanently as it is needed for SUPPRESS option * fix(craft_application/util/pro_services.py): incorrect service name in build_service_scope * feat: added exception for unsupported pro services * fix(craft_application/commands/lifecycle.py): missing lines in pro help msg * feat: add "fips" as --pro argument value * feat: only check pro status on host in managed mode * refactor(craft_application/application.py): update comments * fix: linting issues found in canonical#438 * refactor: switch to pytest.raises + nullcontext instead of try/except * feat: added validation to managed mode * refactor: fixes for linting problems * feat: ignore validation outside of lifecycle commands * refactor: export ProServices, and ValidatorOptions in __init__.py * refactor: noted ubuntu requirement in --pro arg help string * refactor: applied black reformat
* feat: remove version pin from craft-providers for dev * feat: add setup pro services * feat: remove exess logging in paused block * fix: pass pro services instance in run_managed * test: force pro client install * test: remove pro validation * test: disable auto-enable services * test: attach pro subscription * feat: craft_application enables pro services * fix: ignore temporary lint warning * fix: temporarily supressing ruff warnings until pro features are merged into main * feat: pass use_host_sources to lifecycle service * fix(craft_application/application.py): incorrectly checking absence of pro argument
- added caching for --pro argument value on lifecycle command - added early abort for commands reentering instances with varying --pro argument - refactor Ubuntu Pro configuration for LXD instance - fixed Ubuntu Pro services validation for standard builds on pro hosts - added Exception resolutions aware of managed state
lengau
reviewed
Sep 19, 2025
| @@ -591,63 +664,63 @@ def get_arg_or_config(self, parsed_args: argparse.Namespace, item: str) -> Any: | |||
| def _run_inner(self) -> int: | |||
Collaborator
There was a problem hiding this comment.
This function has a big ol' merge issue we'll need to look at :-)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note: Currently in draft!